fixed code standard issues