Cleaned up wcma tool code
MM