Code cleanup, fixes after CR