Moved repository declaration to the right place.
Refactoring.
Cleanup.
Rely on new helper method.