Clean up and format source code
Document some changes made in config