fix some warnings and indentation update