Space fixes and lint fixes.