Remove some bound names
Adjust formatting