update header files and fix indentation