Moved vars and constants around