Coding Style Refactor