cleaning up call method to reduce complexity

refs #27