Fixing coding std & doc blocks