Fixing several small spacing issues