Moving things into before_script