Removed useless comments and cleaned up code

More specifically, got rid of obsolete Log.v printouts, commented out
sections of code that are no longer needed, and added spacing to large
blocks of code for easier reading.