minor changes (reduced code length, set init pushes to 1)