Hopefully fixed indentation so diffs are better readable