Refactoring, primarily replacing ") (" with "$"