Cleaned up aliasing