refactoring my previous fizzy project