Made some clean up changes

Just neatened things up a little, removing unnecessary commented code
and such. Nothing special.