some cleanup + aliases