code cleanup..