normalization, comments, etc
minor cleanup