Respacing/Resizing refactor complete