Cleaning and minor implementations in Networker