More minor changes, mostly reading and restructuring