minor style changes added. I have decided to go against lining up equals signs, for the sake of consistency. Will go through files to confirm all is consistent, soon