refactored shared partial calls and fixed indentation on spec