Revert "Format issues"

This reverts commit 00ea27c103acc3acc718751bbb8abf4582af941a.