Standardise coding style
Configuration: rename config options
Update README with new config options