Fixing author comments and removing headers