refactored services - removed static