latest styling work underway, a bit of refactoring too