Removed unused aliases and refined structure