Code cleanup;