Micro codecleanup