refactoring, remaking dev styles