style/code cleanup