Fixed some formatting issues, removed namespace aliasing - might still be useful in some cases (ex. using routers as a variable by aliasing any routers that you might need)