Add aliases for windows and some cleaning