Code cleanup2

try 2