cleaning up to make it leaner