add indentation and comments