de-cruff, old comments, white space and some consistancy