more consistency in naming, better docstring