comments & codecleanup