Few more cosmetic changes, and added Golden output file