cleaned everything a little