whitespace cleanup
simplify fleetctl