Code cleanup (again)