perform further codecleanup