Cleanup, stmt rules working