Removing chosen reference & getting code order consistent.