refactor to comply the styleguide