Minor prettying up of code. Mostly removing old commented out code