Speed up answer insert and make more readable/reusable