Reformatte and clean up (reverted from commit 325772134be0ab7170bf1eff5534db7b02909617)