Few spacing cleanups to keep style consistent