Cleanup of project

This pr cleans up the imports over the entire project, as well as removes unused @Autowired bindings. Finally, it has some improvements in readability, especially while dealing with optionals