Coding style nitpicks