Coding convention clean-up