Optimization...
Small Cleanup