Now with less clutter