Reduce redundancy. Closes #48