Tiny code cleans