Fixed formatting, and improved file structure.