Cleaner code (i'm able to understand it again)