Revert "J style edits and the horse"

This reverts commit 36f95d334ed11bec90fb7be68a75b6b21098962a.