Finished initial code cleanup
v1.1.0