Code cleanup.
.
Fixed #77.
.