cleaned up my challenge