cleaning up scope misery
resolving clonflict