Addressed specs
Refactored as discussed in meeting
Minor cleanup
Merge branch 'feature/fault_tolerance' into feature/fault_tolerance_rake_task