Cleaned some stuff up

still works :P