Improved indentation system, possibly resolve #6