Better var checking
Improve route module