Added list of clients and cleaned up