Stylistic changes - addressing Mikhails comments.