- code cleanup to work better with Google's closure compiler