correct indention and other