cleaned everything up a little