cleaning stuff up a bit. css to come