clean'd stuff up