Optimizing code a bit; Call to service now made only once
Tests not working - trying to push to CI