cleanup and descriptive comments