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

This reverts commit a4bae4f5253beefaeb5ef680e74fe44220c565f8.