refactoring code
Merge branch 'master' of github.com:casepress-studio/alienship-cp