Refactored specs
Helper method
Documentation for all methods