adopt some more code style stuff