[TASK] Fixed some styleguide issues