*Last of the PR changes
*Removed reference to configFile
*Formatting