Revert unintended changes

Various small changes were made unintentionally. This is just cleaning them up