updated and clean up solutions