simplify documentation
clean extra comment
better handling of utility functions