Did some cleaning up in the main shader