code cleanup, grunt warnings