Cleaned some code
Cleaned some code