v1.4.1:
Cleaning up some code.