Improved auto-indentation. refs #12