clean up these a bit