Code cleanup to follow wp standard
Update version