lil more clean up