remove recursive include
fix indentation