@papoola code completion

@papoola code completion, and small formatting of a code.