Parameter and Binding simplification/refactoring. Rewrite's Back, All Right\! (All Tests Passing)