Changed style of all code for consistency