clean up based on suggestions