Removed commented out code, reformatted code with ctrl+t, some other minor cleanup