Revert "Fixed ugly spacing issues"

This reverts commit 2e74708e71d67d7ca5e0b2341fd338bc38f67d71.
Actually fixed formatting without screwing up line endings