cleaning code, removing class/module nesting