began refactoring styling