Improved indentation and workaround for buggy column numbers