Updated because of coding guidelines