Improving names
Using inject instead of autowired