Improved setup order (no vim warning)