Cleanup Format
merge changes