cleaned up #19 a bit