Changed a few things for consistency.