Refactor + testing odds calculator