new styling
refactored to prepare for other services