We might want to redo the indentation on these blocks since we're taking away one level of control structure?