Removed premature setFinished() from MetadataServiceHelper. Fixed other style issues pointed out by Tom and Ajit.