Refactor, clean