fix #272

Duh, simpler code cleans up redundancies!