CI and some style changes