Gamma: clean code to remove warning message
remove minor warnings during build