Added comments and removed consts
Added missing methods, fixed typos
Refactor to single helper class
Missing template added and default constructor added
Refactored scalars
Refactored helper class tempalte handling