Fixed indention and comments