Refactoring and restyling.