cleanup
code quality