Code cleaning (again)