Minor dependency improvements. Whitespace adjust.