solidifying dev style
refactoring