fixed white space issues and other code layout details
Merge remote-tracking branch 'origin/experimental' into experimental