suggested code cleanup