Code cleanup

@aduggin