#29 Refactor finished