my code cleanup