More changes -- style and all logic