Avoiding multiple calls of shape function.
Improving Readme and correcting variable names.