Minor cleanup
Merging changes