Details: - Conform to conventions.
Details: - To make it conform to naming convention.
Details: - And do some simplification/consistency.