Code cleanup...