minor trimming/cleanup