Fix minor issues
Cleanup