Adding authors and cleanup (#627)