Cosmetic
Fixing pickling bug
Refactoring of helper functions in order to return more actionable data