Code cleaunp #1

Cleaned stuff up