rename class and removed nested function