updated usage, cleaned up command construction