Clean up

Cleaned one class