A little bit of refactor and preparation for friday