Cleaned up

Cleaned up