Cleaned up

Cleaned some code up.