Yet another code cleanup