another pass at cleanup