#311 Revert wrongly committed config/datasource files. Code formatting changes