cleaning stuff up a bit
undoing some stuff I broke