Refactor dynamic method invokations to use more direct syntax
Refactor extension methods