Code lisibility improvment, structures reorganisation