Code conventional modifications.