Refactor
Style tweak