fix code according styleguide