Simplified equality
Added eta reduction
Bug fixes
Added back import
Namespace substituted variables