cleaned import
slight refactor
s/g