Tried to apply format conventions