Cleaned up some rules