Stephen - more documentation / code review