Fix indentation
Update changes from Ethan and Mike