Reformatting
Pushed various configuration options into properties