Refact sprint 1