:sunny: Clean code

The code is now cleaner, annotated and more structured