More Code Cleanup

Still getting the hang of github :D