Can we clean up the indentation here?