stylistic changes, and some interface polishing