Fix sing warnings

Fix warnings, braces, indents and small fix of doxygen description.