Whitespace & fixes from 554