Improved code cleanliness and fixed localisation bug

Removed commented out code
Added the ENGLISH locale for each String.format that use numbers (example : in france we use "," as a decimal point so String.fromat("%f", 3.5F) would give 3,5 and trying to parse this will crash the program)
removed useless genericty type informatino example HashMap<String, String> = new HashMap<>(); the new doesn't need anything between the < >