code improvements / fixing doc blocks
doc blocks