cleanup and smaller hammer