minor codecleanup