Fixed mainly indentation and comments.