Refactored style a bit