Improve setup
Adjust formatting