Chores/maintanance

With some :lipstick: the code is now more pretty!