some code cleanup!