Fixed export of config module;
Cleaned source code;