Code cleanup in MIME class