applied some styleguide