improvement?
some cleanup