header file and indentation cleanup