Move stuff out of conditional because I'm dumb