removed some confusing syntactic sugar, removed spy
imports organized