updated to follow code standards