Refactoring and making it look pretty. :hammer: