Split sink and source utilities in client side code
Remove unused set command
Run go fmt around