Comment and tidy AM and ASWAM