started with the code cleanup