Go fmt & Go vet fixes

Added keys to CLI flags