syntax cleanup
clean up excessive commenting