Updated cyvmath, small code style revision