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 quit my current job and have more time. 

:beers: