Improve naming, simplify a bit