Coding Style improvements