Lot of code cleanup + added chrome:// url completion