Issue #503 Fixing indentation and spacing