[IRESCutaway] - Refactoring and Fix Uniform Buffer method.