More clean up add author