Code cleanup, some typos, variable naming…
Removed unused method.