#422 Improced documentation and method names