Bill|George|Michael|Carol Minoring refactoring & fixed a bad @Autowired annotation