More formatting and consistency fixes

this should be -1