Refactoring annotation factory obtainment

I personally prefer these early returns, seems cleaner for me.

Btw I'd like to say that I'll be willing to contribute soon, when I leave my current job and then have more time. 

:beers: 
Remove trailing spaces