Made some minor changes mostly w.r.t. code formatting