Code cleanup.
Fixing config file.
Code cleanup.