Remove superfluous $parse provider
Extract method refactoring
Improve specs