made code valid to google code convention