Code clean up and better arguments usage to invoke and retrieve methods