refactor namespace and update for todo on chapter one