Refactored, polishing