Cleaned up the code; shaders are now used by every batch