Clean up, make consistent with other dev tools