removing more syntactic sugar
reverting