Further compliance with coding guidelines (separation)