implement alias, some cleanup