Refactoring
--