Coding conventions, cleanup