General cleanup
Fixed Issue 2.