[TASK] Fix some coding guidelines issues

This patch fixes some issues with coding guidelines