some codecleanup