More code cleanup, no change to logic etc