Version pdf re refactor =)