refactor
cleanup
fixes