cosmetic changes
moved things around quite a bit