Finished refactor #2