Some styles added
refactoring