challenge 1-1 cleanups