Code formatting following various code changes merged today from various text editors/IDEs (Just cleaning up code and generally formatting as per our formatting standard.)