refactored style