refactoring: add hsw and remove some spaces