some optimization
cleanup
some cleanup
revert