refactoring and restyling some