ymca cleaned up

Feedback