minor changes for posting on SO