Some cleanup and some little stylistic changes all over