More code cleanup please