More style fixes and generally rethinking some of the poorer sections