mgordel Clen up code before deploy. Finalize agent fixed types of constructor