Need code cleanup