indentation and refactoring
shader class partial implementation