Merge "Improve variable naming and coding styles"