Cleaning up code with dynamic method calling

01/01: Cleaning up code with dynamic method calling