cleanup for code sprint part 1