Simplified the type system; Removed all type constants
Trivial updates