removed useless code
fixed doc blocks