Reorganize var/ a little bit