Doc blocks and fix indentations