cleaned some stuff for simpler testing