Small clean up in order to merge this into the master