Added comments
Restructuring of config and output