Revert 0bee093..c405343

This rolls back to commit 0bee0930d3623777679ef469a63528ec438d58f2.
fix formatting issues