Removed unnecessary - old code
Fixed syntax and minor bug