clean up indentation, add include guards