Some refactoring on answer page