Change style to follow quality standards and be much more readable