Formatting

-Tidied up the code!