cleanup and beefup