Refs #343: updates from code review

@copelco ready to review again