Coding style clean-up