Refactor/clean more