Make interface for docker commands, clean up some logic per feedback