finished up refactor