Small coding style fixes
Added support for configuration files