Add header comments and fix indentions