Code Cleanup

Added comments and spacing, removes some lines of unnecessary code