Small optimizations and fixing indent to shaders