Clean things up

should make things run slight bit smoother