minor edits on helper classes