#212 , adjust identation and documentation