Fix errors and indention