Simple code cleanup