Refactor/clean up