Fix author
Grand refactor