Cleaned up one overly complex method a bit.