cleanup
added ideas for refactor