Refactor stats code + axis titles