cleaned somethings up