Coding style issues and a bit of new material