add author and cleanup