General Code Cleanup

Remove extra lines, comments, etc.