Refactored style and naming