Clean up code and add aliaser class.