Adapted to coding style