clean up/ refactor