added indentation support and temporary modules removal