Code refactor and finished example part... maybe