Refactoring
Style changes