just a bit of clanup and minor changes