restructure
unnecessary space