Polish comments, for Developers notes and TODO clean-up