Minor update
Fixed a few coding issues