Fix indention

Fix indention with code reformatter + manual re-adjustments