Removed several code-spacing changes that were not needed