Beautified the files - ready for submission (Y)