some code beautifying, removed obsolete comment