* Code cleanup: