Code tidy up, got rid of old comments