Revert "work in progress to make code prettier"

This reverts commit 4b5e328bda5d6920d7ccfdde5907136cff7a354e.
Revert "Revert "work in progress to make code prettier""

This reverts commit 2f5cc367b691eb5a3b42b529d43120bf965f15de.