psr-2 compliance
psr-2
fixed doc blocks
cleaned up doc blocks