Fix old data structures
Code clean-up and fixes
Removed unused variable and updated Podspec