Use user.person, fix indentation, move misplaced profile code