Problem-3 clean up