New indent adjustments, will break tests until I fix them