Tidying a few things up with WYCS