Changes due to Inspect Code