Small comment fix
Moved some constructor code