Refactoring of podspec