fix spacing...once more
change names / clean up