Fixed, based on suggestions.