Revert "clean up style and syntax"

This reverts commit 9535b7186d4e916ad821517af0de13b5c84aa87d.