Assessment refactoring and question block in answer

See commit messages for specific steps taken
Not sure what you mean exactly by removed - can you detail a bit more? Pointing to specific lines of code can help, too : ) Thanks!