Clean up, small optimizations