VP-211: Made few cleanups and quick changes after Justin's review