Updated normalize method