updated notation
Clean works
Cleaned up the old interfaces