Code: Analysis & minor improvements.