simplify

fixed a few things, made it simpler