Small changes
Cleaned up some code