Cleaned up code, added duplicate alias check, rebranded