Reordered codes and optimized imports