Cleaned the code to respect java standards