Moved some lines of code around files and commented some code