Quite a bit of extraneous space here. Can this be cleaned up?