Revisiting coding style
Version update, deps fix