Small Optimizations for page load times