refactored style a bit more