Final commenting and indention correction