Coding Style clean-up