Web: Add normalize and cleanup a bit