Minor cleanups
More minor cleanups
Fixed minor error