Revert "Ran files through astyle. Changed things a bit much though."

This reverts commit c4ccf1932fa8048141866adc9117979f24c979b5.