More formatting and consistency fixes

Reverted all changes for "-1"