Code cleanup: