code reformating
tweaks