Added proper doc blocks
Added proper doc blocks