More formatting and consistency fixes

should be -1