cleaned everything up a bit