Quick Code cleanup