check style + optimization
fix warehouse