Cell formatting and code optimization changes