Refactor
Style