Decidiing to not include Program
Cleaning up comments