Some improvements
Standardize the structure