Small fix/cleanup