Cleanup previous commits

Rename, reindent, change arg order
1 file changed