Few renamings ..
Minor updates (code sugar) ..
Minor updates (code sugar) ..