Trying to clean up indentation