Changed header format, added some additional comments