Cleanup a bit after PR