Add some styles, minor refactoring