Updating header comments
Removing accidentally duplicated code