Changing a bit of Style, getting rid of unneeded globals