Minor Code Optimizations/Changes