Refactor author block