cleaned up comments, formatting etc. for turn-in