Refactor and clean