better look of the code, now looks clearer