Xaiki/fix warnings and style

please, let's not ignore style.