Improve naming, docs and remove some todo's