Fix duplicate method call and feature envy
Fix duplicate method call and feature envy

pdswan/rom,dekz/rom,pxlpnk/rom,endash/rom,dcarral/rom,pvcarrera/rom,Snuff/rom,rom-rb/rom,vrish88/rom,rom-rb/rom,rom-rb/rom,kwando/rom,denyago/rom,cored/rom,jeremyf/rom