Small Optimization on port