ShaderBasic refactor, cleaning
Cleaning