minor interface and whitespace cleanup