code guard improvements
more codeguard improvements