code review: coding conventions + TODOs