Space simplified

next - linking cleanup