Fix #467
Suppressed line break
Suppressed unused code
Replaced Autowired by Inject