Cleaned up a bunch of commented code