Resolve identation in organization. Enhancement #124