Code clean ups. Rename function to PascalCase. v0.2