Remove include and fix indent errors