updated to latest coding style