Working on implementation of a new vendor - some cleaning and optimizing todo