Modularize services
Use strict