Cleaned up code.
v0.1.14