Little refactor
Second simple working version