Tighten

Combined some lines in initialize