cleaned some stuff up
cleaned some stuff up for real