Code Formatting and remove strange";"