Adapted to guidelines coding style