cleanup
remove comments tweak