[IMP] Little code layout changes.