Cleaned up riffy