Refactor and clean code.