making things flatter, starting on #86