Fix indentation issue causing problems in cleanup phase #6