clean up, code beautification