Rearrange code, actually use defaultAuthor
Remove path assumption