Improved conformity with coding guide lines.