minor syntactic improvements
synchronized presentation with source