Indentation + removed terminal context switch