remove intermediate variable add inline comments