did some minor refactoring. Backing up before changing main shader