formatting, moving logic