Dimaified the setup, broke out aliases into separate file