clean up lib methods & add solution