Removed unnecessary setting of metadata model and some whitespace.