[TASK] Fixed some coding standard issues