Few changes
Cleanup