minfied and cleaned some stuff up