Add empty lines
Refactor handling of services in Application layer
Refactor callService implementation
Add tests of STWServiceCallFactory