removed cruft
renamed a little bit