Improve naming, add doc