Improving performance, cleaning up source