Improved conformance with Google's "Shell Style Guide".