FIX: Indentation errors after merge from original master!

Testing to be working okay...