[R2D/Common] Tidying up using directives