Minor code shuffling
2 files changed