cleanups from cjo
link to coding guidelines