Converted static calls to injections, expanded readme and other smaller review related tasks.