Code cleanup. Is this cleaner or is this cleaner?