Cleanup make lint happy