Fixed remaining spacing issues