Changed indentation defaults and removed some strlen calls.