Formatting the project in a more propper style