Code clean up

Signed-off-by: Anton Kolesov <anton.kolesov@synopsys.com>
Change formatting of code in some places

Signed-off-by: Anton Kolesov <anton.kolesov@synopsys.com>