Update typos
Remove SmartContext