Moved things over to google's code standard... almost..