restyled, refactored