Removed typename keywords where not needed (Fixes #2)