Refactor include style