fixed include and formatting