Revert "Revert "Fixing author""

This reverts commit cf349741d46ce879628a70bd91d896fa9b4c2b34.
cleanup