Done some formatting to respect standards.