Minor modifications to files, mostly asthetic