make scope configurable
random cleanup