Refactoring and Style Changes