space setting update and refactor