refactored/styling