Revert "Revert "File cleanup (spaces, tabs etc.)""

This reverts commit 567c437bdb92ef92e9509118e49d6b7cd9260376.