code cleanup!