split out, improve