Small fixes (mostly aesthetic -- formatting etc.)