- work on cleaning up from refactor